From f5cbcc33d2d8a0437fc99cd65af4acad2d438e18 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Thu, 10 Aug 2006 10:45:10 +0100 Subject: [PATCH] [HVM] Rmove unused field pae_enabled from hvm_info_table. Signed-off-by: Xin Li --- tools/libxc/xc_hvm_build.c | 8 ++++---- xen/include/public/hvm/hvm_info_table.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_hvm_build.c b/tools/libxc/xc_hvm_build.c index b99494e0dc..546668f33d 100644 --- a/tools/libxc/xc_hvm_build.c +++ b/tools/libxc/xc_hvm_build.c @@ -167,7 +167,7 @@ static void set_hvm_info_checksum(struct hvm_info_table *t) */ static int set_hvm_info(int xc_handle, uint32_t dom, xen_pfn_t *pfn_list, unsigned int vcpus, - unsigned int pae, unsigned int acpi, unsigned int apic) + unsigned int acpi, unsigned int apic) { char *va_map; struct hvm_info_table *va_hvm; @@ -186,7 +186,6 @@ static int set_hvm_info(int xc_handle, uint32_t dom, va_hvm->length = sizeof(struct hvm_info_table); va_hvm->acpi_enabled = acpi; va_hvm->apic_enabled = apic; - va_hvm->pae_enabled = pae; va_hvm->nr_vcpus = vcpus; set_hvm_info_checksum(va_hvm); @@ -194,7 +193,6 @@ static int set_hvm_info(int xc_handle, uint32_t dom, munmap(va_map, PAGE_SIZE); xc_set_hvm_param(xc_handle, dom, HVM_PARAM_APIC_ENABLED, apic); - xc_set_hvm_param(xc_handle, dom, HVM_PARAM_PAE_ENABLED, pae); return 0; } @@ -285,12 +283,14 @@ static int setup_guest(int xc_handle, goto error_out; } - if ( set_hvm_info(xc_handle, dom, page_array, vcpus, pae, acpi, apic) ) + if ( set_hvm_info(xc_handle, dom, page_array, vcpus, acpi, apic) ) { ERROR("Couldn't set hvm info for HVM guest.\n"); goto error_out; } + xc_set_hvm_param(xc_handle, dom, HVM_PARAM_PAE_ENABLED, pae); + if ( (e820_page = xc_map_foreign_range( xc_handle, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, page_array[E820_MAP_PAGE >> PAGE_SHIFT])) == 0 ) diff --git a/xen/include/public/hvm/hvm_info_table.h b/xen/include/public/hvm/hvm_info_table.h index 38911800cc..69e5dcf19a 100644 --- a/xen/include/public/hvm/hvm_info_table.h +++ b/xen/include/public/hvm/hvm_info_table.h @@ -17,7 +17,6 @@ struct hvm_info_table { uint8_t checksum; uint8_t acpi_enabled; uint8_t apic_enabled; - uint8_t pae_enabled; uint32_t nr_vcpus; }; -- 2.30.2